From: Po Lu <luangruo@yahoo.com>
Date: Tue, 12 Mar 2024 00:51:52 +0000 (+0800)
Subject: Fix notification cancellation detection on Android
X-Git-Tag: archive/raspbian/1%30.1+1-3+rpi1^2~14^2~18^2~2283
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=bf38783c32e794e46fd03210242f265f34257940;p=emacs.git

Fix notification cancellation detection on Android

* java/org/gnu/emacs/EmacsDesktopNotification.java (display1):
Don't specify FLAG_ONE_SHOT in cancel intents.
---

diff --git a/java/org/gnu/emacs/EmacsDesktopNotification.java b/java/org/gnu/emacs/EmacsDesktopNotification.java
index f52c3d9d4fb..d05ed2e6203 100644
--- a/java/org/gnu/emacs/EmacsDesktopNotification.java
+++ b/java/org/gnu/emacs/EmacsDesktopNotification.java
@@ -281,11 +281,9 @@ public final class EmacsDesktopNotification
 
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S)
       pending = PendingIntent.getBroadcast (context, 0, intent,
-					    (PendingIntent.FLAG_IMMUTABLE
-					     | PendingIntent.FLAG_ONE_SHOT));
+					    PendingIntent.FLAG_IMMUTABLE);
     else
-      pending = PendingIntent.getBroadcast (context, 0, intent,
-					    PendingIntent.FLAG_ONE_SHOT);
+      pending = PendingIntent.getBroadcast (context, 0, intent, 0);
 
     notification.deleteIntent = pending;
     manager.notify (tag, 2, notification);